From 30ff35296039946924c977e5d8dd6f767a53d6fa Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 7 Jun 2023 00:29:39 -0400
Subject: [PATCH] print: Maintain compatibility

gtkunixprint.h is a public header, that needs
to keep being installed in the same location.
---
 gtk/{print => }/gtkunixprint.h              | 0
 gtk/meson.build                             | 9 +++++++--
 gtk/print/meson.build                       | 1 -
 modules/printbackends/gtkprintbackendcups.c | 2 +-
 modules/printbackends/gtkprintercups.h      | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)
 rename gtk/{print => }/gtkunixprint.h (100%)

diff --git a/gtk/print/gtkunixprint.h b/gtk/gtkunixprint.h
similarity index 100%
rename from gtk/print/gtkunixprint.h
rename to gtk/gtkunixprint.h
diff --git a/gtk/meson.build b/gtk/meson.build
index 7b8926451b..84e8b0ad89 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -675,8 +675,13 @@ if os_unix and tracker3_dep.found()
   gtk_sources += 'gtksearchenginetracker3.c'
 endif
 
+gtk_unix_print_main_header = [
+  'gtkunixprint.h'
+]
+
 if os_unix
-  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_main_header, subdir: 'gtk-4.0/unix-print/gtk')
+  install_headers(gtk_unix_print_headers, subdir: 'gtk-4.0/unix-print/gtk/print')
   gtk_sources += gtk_unix_print_sources
 endif
 
@@ -1254,7 +1259,7 @@ if build_gir
   ]
 
   if os_unix
-    gtk_introspection_sources += [ gtk_unix_print_headers, gtk_unix_print_sources ]
+    gtk_introspection_sources += [ gtk_unix_print_headers + gtk_unix_print_main_header, gtk_unix_print_sources ]
   endif
 
   if os_win32
diff --git a/gtk/print/meson.build b/gtk/print/meson.build
index 79f4d085de..a5263da99d 100644
--- a/gtk/print/meson.build
+++ b/gtk/print/meson.build
@@ -26,7 +26,6 @@ if os_unix
     'gtkprintunixdialog.h',
     'gtkprinter.h',
     'gtkprintjob.h',
-    'gtkunixprint.h',
   ])
 
   gtk_unix_print_sources += files([
diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index aa9b515878..0382c8983d 100644
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -45,8 +45,8 @@
 #include <gmodule.h>
 
 #include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprintbackendprivate.h>
-#include <gtk/print/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 #include <gtk/gtkprivate.h>
 
diff --git a/modules/printbackends/gtkprintercups.h b/modules/printbackends/gtkprintercups.h
index fb67f6ac83..30edcece27 100644
--- a/modules/printbackends/gtkprintercups.h
+++ b/modules/printbackends/gtkprintercups.h
@@ -23,7 +23,7 @@
 #include <cups/ppd.h>
 #include "gtkcupsutils.h"
 
-#include <gtk/print/gtkunixprint.h>
+#include <gtk/gtkunixprint.h>
 #include <gtk/print/gtkprinterprivate.h>
 
 #ifdef HAVE_COLORD
-- 
2.30.2